Circle refactor