formatting, light refactoring [ci skip]