rubocop cleanup, long lines, etc

feel free to cherry pick etc