Refactoring: got rid of a couple of parentheses

Because `if`s and `()`s are evil. Also, the code looks a bit more idiomatic now.