Changed the way Circle and Square are done. Removed repetitive code