Update code to be simpler
Upgrade unparser gem dependency

* Fix now (partly) passing specs