Refs #7156 - Addressing more rubocop cops