Application class optimisation and refactor