Improve style

* Brackets are optional
* Explicit returns should generally be avoided
* Parentheses for function calls should be avoided except where they provide extra clarity.