Minor refactoring
Tweaked and corrected some comments.
Authored by: delphidabbler 2013-02-24
Parent: [r2806]
Child: [r2808]