refactor the comments