Small refactoring, heading onto the Main