Refractored "Location.java"