sorted methods in and clean up value mapping class
refaktor value mapping, reuse code