Atomic refactor