minor go idiomatic fixes