Completed Rectangle
Refactor Rectacngle