split mapper in methodes and adding comments