cleans up the app to be more conventional