refactoring a few parameters