Finding Keys & Closure Cleanups