PR Review changes

- rubocop 0.27.1 fixes