Refactoring objects issue - C#