Refactor oldValue initialisation