"find" command enhancement
Some refactoring and method renaming