cleaning up Application class