Clean the new code around for refactor.

HTML driver will be there, but separate text driver first.
Move text formatter in own functions.

Begins to look better!