Did a little clean up and renaming of things