Cleaned up app format