code cleanup, reordering of outputformats