More tidying of location template