Refactoring Hydra - Pass 2