Update golf to take an optional input string. Fix some structure/formatting in golf as well.