Refactoring Hydra - Pass 1