Finalizing app with comments and cleaning up code