#22: refactorings and potential fixes in ProfessionMapred