Cleaned up the application a little