minor cleanup + renaming