cleanup of tabbing and dist