refactoring: args, params
refactoring: params, args (part 2)