Remove extra `else` after `if` with a `return`
Remove extra `else` after `if` with a `return`

Suggested via `golint`:

Line 525: warning: if block ends with a return statement, so drop this else and
outdent its block (golint)

google/code-review-bot,google/code-review-bot