Improving my Class - C#