Cleaned up returns in createLocator().  Moved a couple of TODOs to the Refactor file