I know that you didn't change this line. It's only a convention to omit the `else` if the `if` statement contain a `return`.  

But i will make a seperate PR to fix this.