Refactoring of the code done
Merge branch 'master' of https://github.com/itoledoc/APA