Fixed some unnecessary reformatting in this branch
Fixed a couple of layout/comment errors in the patch