Refactoring Hydra - Pass 3