Code review PR

No `{ }` for purely functional methods.