[Code Style] mod_finder : Various changes