[Code Style] mod_finder : Various changes
Merge pull request #4606 from marcodings/mod_finder

[Code Style] mod_finder : Various changes