a little clean up and renaming