some enhancements to rubocop linting