Rename variables & refactor methods