Fixed number of smells.
Merge branch 'fix-smells' into develop