refactor comments section