Refactor code (change variable names)