Adittional refactoring
Merge branch 'master' of https://github.com/samancro/EFIA-PROJ2