Salt software state refactored