Minor refactoring and fixing the Greyhound racing job