rename, refactor and remove