Refactoring, not using .NET conventions