REPORT-575 - Added some clarifying comments in code