Update to cleanup comments & add line break to end of file