Refactorinf deliverables_controller