Refactoring - rename variables and other refactoring