Avoid nested map/getOrElse sequence for readability and formatting

Purely aesthetic:
* Add return type on public methods
* Avoid nested map/getOrElse sequence
* Some formatting (that's why I created #170 - a uniform indentation would be great.)