Refactor original greengrocer slightly