Comment and refactor