correct indentation, correct column widths etc, refactored configurable options; cleaned up code