Go fmt cleanup