Sam and Carter:Refactoring