Moar small changes

* Use string interpolation
* Remove yet moar traces of the old life.