Finish off formatting, remove useless comments Commit finishes off formatting changes and removes useless, out-of-date, comments.