Refactoring start() and associated files.