In Relentless Pursuit of REST

Refactoring