Added some code comments and began cleaning up UI