refactor, added comment type