more small clean ups and renaming