Commented and decomposed FileSearcher code