Organize a bit, add findstr function