Clean up and implementation of GetFromTo