refactor comments