clean up, move methods, renamings
refaktor to parameter mapping handler