Refactoring plus added comment deletion