Modularized the finding of defects