cleaning up more of the app for mvp release.