Cleaned up AppDelegate