Refactor source circuits