Some refactoring on Rect