Refactoring related to comments and instructions inside code