mostly minor cleanup