A simpler approach for reducing output clutter. Closes #158.