Updated all code in Mapper.py after the style, except for the function names