Small Refactoring to Location Updates