a refactor and rename