Added refactoring that adds comments