Cleaning up app code