Refactoring some of the input parameters