marks main refactoring