Refactor (variable names)