cleaned up app a little