style cleanups from Rubocop. not finished yet