Refactoring - parameters, variable names