Final commit, last comment and formatting changes made