refs #682 : Clean commented code