Refactoring notes in comments