comments, refactor