fix(resolve): algorithmic and readability improvements

fix(resolve): algorithmic and readability improvements #23