small refactor on autoUnit