Cleanup on Aisle C.

Cleanup & Reordering.