cleaned up app