Refactor work