Refactored rectangle, added constructors to circle and rectangle