Implement fixes indicated by pull request comments

* Fix misplaced comment
* Add guard clauses to remove unnecessary if blocks
* Remove unnecessary return statement
* Move LocationInfo serialization to separate function
* Add "pretty-print" option.
3 files changed