cleaned up app object a little