Refactor source