Small tidy up, bit more Go(d)lang.