tiny tweaks

simple grooming
formatting, removing unused code