Cleaning up the main app