code cleaning, comments, precise search