Reorganized a few extends and cleaned up transitions