UAR-696 - Correcting commenting.