Code cleaning.
Merge branch 'code-cleaning' into develop