Cleans up Location class and interface