[ref] Refactoring...