improved find declaration, a little lit of cleanup