mapping function reduced
method renamed, typos removes, Fixes issue #3