Some cleanup and retab