add comments creation; refactoring