small clean ups and renaming; no new features or logic