Merge "Refactor Location.java"