saltstack support
minor refactor