Go 1.0 compatible if { return } else { return }

Transform if { return } else { return } to if { return } return for
compatibility with older Go