Slight refactor to map
Slight refactor to map

joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps,joelmahoney/discoverbps