Clean up the code.
Renames, deletions