Refactor start method
More refactoring