VID-1082 Changes following code review
Updated comment style
Merge pull request #2663 from Wikia/VID-1082_Pt2

VID-1082 Changes following code review