scaff. refactor WIP [ci skip]