Refactored code to eliminate start action