Makes map service check style compliant

Method is too long and too complex.