cleanup and fix missing finder var