Add a few more comments, and fix some formatting - Final commit before submitting