more refactoring to use dotsplat commands