Several updates to Mapper.py:s code style.