Refactoring and solved 'Jill Rides Again'