Organized code and start again to work on app