deliverable - refactoring