reformat some of the code
style map markers to match specs