Comment, refactor