Refactor block