refactor Circle model; closes #6