minor code cleanups

more coming.