Refactoring in order to obtain a better grade on CodeClimate
Merge branch 'architecture' of https://github.com/gbrego/SRA into architecture