Refactor comment