Fixed remaining rubocop issues