Rubocop issues fixed