Refactoring some comments