enhanced output table style, cleanups, cleanups, cleanups