Addressed @davecheney comments
Go fmted