clean up files and little more refactoring from the created to start and end