A couple of small refactoring before getting ready to publish the first version of Doxygen plugin