Refactor
Post rename del