Refactored. [ci skip]