#59 Code Cleanup

First round of code cleanup for app submission.