I'll help improve this election contract by splitting it into smaller, more maintainable components and adding some enhancements. Here's the refactored version: // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; interface IElectionState { enum ElectionType { SINGLE_POSITION, MULTI_POSITION } enum State { DRAFT, SCHEDULED, ACTIVE, CLOSED, FINALIZED } struct Election { uint256 id; string title; string description; uint256 scheduledStart; uint256 scheduledEnd; uint256 actualStart; uint256 actualEnd; ElectionType electionType; State state; string[] categories; uint256 durationSeconds; bool hasCandidates; } } // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; import "./interfaces/IElectionState.sol"; abstract contract ElectionBase is IElectionState { address public immutable owner; mapping(uint256 => Election) public elections; uint256 public nextElectionId; event ElectionScheduled(uint256 indexed electionId, uint256 startTime); event ElectionActivated(uint256 indexed electionId, uint256 actualStart); event ElectionClosed(uint256 indexed electionId); modifier onlyOwner() { require(msg.sender == owner, "Only owner"); _; } constructor() { owner = msg.sender; } } // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; import "./ElectionBase.sol"; contract ElectionCreation is ElectionBase { function createElection( string memory _title, string memory _description, uint256 _durationSeconds, ElectionType _electionType, string[] memory _categories, uint256 _scheduledStart ) external onlyOwner returns (uint256) { require(_scheduledStart > block.timestamp, "Start must be in the future"); require(_durationSeconds >= 5 minutes && _durationSeconds <= 7 days, "Duration must be 5min-7d"); uint256 electionId = nextElectionId++; Election storage e = elections[electionId]; e.id = electionId; e.title = _title; e.description = _description; e.durationSeconds = _durationSeconds; e.electionType = _electionType; e.scheduledStart = _scheduledStart; e.scheduledEnd = _scheduledStart + _durationSeconds; e.state = State.DRAFT; if (_electionType == ElectionType.MULTI_POSITION) { for (uint i = 0; i < _categories.length; i++) { e.categories.push(_categories[i]); } } return electionId; } function confirmCandidates(uint256 _electionId) external onlyOwner { Election storage e = elections[_electionId]; require(e.state == State.DRAFT, "Already confirmed"); require(block.timestamp < e.scheduledStart, "Too late"); e.hasCandidates = true; e.state = State.SCHEDULED; emit ElectionScheduled(_electionId, e.scheduledStart); } } // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; import "./ElectionBase.sol"; contract ElectionStateMachine is ElectionBase { function checkStateTransition(uint256 _electionId) external { Election storage e = elections[_electionId]; if (e.state == State.SCHEDULED && block.timestamp >= e.scheduledStart) { require(e.hasCandidates, "Missing candidates"); e.state = State.ACTIVE; e.actualStart = block.timestamp; e.actualEnd = block.timestamp + e.durationSeconds; emit ElectionActivated(_electionId, e.actualStart); } if (e.state == State.ACTIVE && block.timestamp >= e.actualEnd) { e.state = State.CLOSED; emit ElectionClosed(_electionId); } } } // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; import "./ElectionBase.sol"; contract ElectionViews is ElectionBase { function getElectionTiming(uint256 _electionId) external view returns ( uint256 scheduledStart, uint256 scheduledEnd, uint256 actualStart, uint256 actualEnd, State currentState ) { Election storage e = elections[_electionId]; return ( e.scheduledStart, e.scheduledEnd, e.actualStart, e.actualEnd, e.state ); } } // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; import "./ElectionCreation.sol"; import "./ElectionStateMachine.sol"; import "./ElectionViews.sol"; contract Elections is ElectionCreation, ElectionStateMachine, ElectionViews { // Combined contract with all functionality }