style: rubocop fixes and other stylistic changes @style