Refactored landmarks/location finding