Refactor to run single find against dictionary instead of two