Refactor and Rename