Tweaking config for rubocop, fixing small style issues