Styalistic fixes in mapparser