Makes map service check style compliant

Yes i understand your point. I want to progress with small PRs
but this PR by nature is big since it introduces mapservice context.
Big changes are error prone and i don't want to break working codes. This is the reason why i left it for a later PR.