Refactoring code
Remove obsolete comment
Cosmetic change