Moved circle_generator into the class

maxnordlund wanted it.