Update comment and refactor