Cleaned up the application