Cleaned up CircleTool