GPII-784: Fixed a bit of formatting and comments