Small refactor
Small refactor

rlugojr/devdocs,hyjk2000/devdocs,rlugojr/devdocs,mnquintana/devdocs,mnquintana/devdocs,rlugojr/devdocs,yosiat/devdocs,yosiat/devdocs,webcoding/devdocs,abougouffa/devdocs,yosiat/devdocs,webcoding/devdocs,abougouffa/devdocs,hyjk2000/devdocs,webcoding/devdocs