Refactored the pocket watch and scythe object.