parameter normalization bugfix
refactoring