Astyle map.h and map.cpp(take two)