(QENG-1400) Removed comments and added in formatting feedback