Refactor coordinates retriever

all specs passing