Some cleanup
More cleanup
Lots of renaming