A bit more refactoring.
Syrup -> simple syrup