Very small refactor