fix some ws nits

TBR - miscellaneous small ws nits and one unused import.