cleaning up app logic..