Working on rubocop issues