Matching new coding style guidelines
Commented code