rubocop cleanup (still a few long methods)