Cleaned up App class