Reordered due to errors reporting on Travis
Commented code
Merge branch 'feature/code_climate_patch' into develop