Bugfix

- Fixes #1425
- Fixes #1426
when you use `return` it stops the flow of execution. there's no need for the `else` block to exist.

i find it  simpler to write my code like this

```javascript
if (condition) {
    return someValue;
}
return anotherValue;
```

this has less branches to read so it's a bit easier on the eye.