- Update to formatting and comments