Tidied up the App class a little more