Correct main refactor