Tidied up the location bit