Addressed Rubocop warnings