Organized code and finalized the auto