Refactor operations