Cleaning up tabbing