Refactor and rename