#10 refactoring of constants and parameters