Minor reformatting/refactoring to p_map.c