ServiceMatrix formatting fixes

Formatting Fixes. ServiceMatrix