Refactor will