clean up app, refactor