Cleaner PreValueMapper

Making the preValue Mapper cleaner so it can be used in the Tracker