removed magic strings and numbers from LocationParser