Added a simple circle and refactored rectangle code