comments, monir refactoring