Refactoring Circle code to make it simpler for tutorial