Refactor naming style, mark, comment.