#193 Using Statement Cleanup - Part 1 - Organize