Clean up namespace in C#