Cleaned up the app