Juggler tidyup

/to @ritch