I agree with you, but I tried to follow the same style of implementation of other classes. (i think we can discuss that later)