Fixed non-idiomatic Go