Cleanup main ouput.
OO / new features.