Updated some of the method comments and ensured they made sense etc. Also did some auto-code formatting on both files.