simplifying refactor; remove circles