Small refactoring [ci skip]