Bit of cleanup and renaming