refactor comments #15