2f0a431 Slight improvemments of of go-format scenario