Refactor code to SonarQube standards

Merged Morris Estepa requested to merge aws-integration into master

Merge request reports