Fix bad smells

Carlos Galindorequested to merge
fix-bad-smells into develop

Based on the Sergio branch, requires !52 (merged) to be merged.

Edited by Carlos Galindo

Merge request reports