Minor tweaks

Couple minor fixes and improvements. No need for custom throws inside
__toString(). Also brought a few lines into 80 cols.