mahore refactoring, parameter parsing