Rename and Clean
Refactor