minor cosmetic changes/renames