Refactored Peter the baker