Refactor <all>