Refactoring Golf changes