Added LocationProperty (Requested)
Remove duplicate/useless check
Some code cleanup