Cleaned the application class