Cleaned up iterating through map using auto and for in loop
Using consistent convention