Makes map service check style compliant

Maybe it is me; but when I move code I make sure that the moved code is clean. 

The problem is that is is difficult for a reviewer to see what belongs and doesn't belong to the cleanup.