More Cleanup

Polishing Up Districts