Refactor Mapping a bit and kill remaining mutations