[skip CI] Refactoring.