Major overhaul.  It is not PSR-3 compatible and the output is prettier.