Cleaned up app