significantly cleaned up the app