Code cleanup
Location object
Location change handler