Renaming, cleaning up code