Is there a cleaner way of writing this? (ie. avoiding the two relations in Location)