Refactoring to standard .NET conventions