Reduce indentation levels in the code
Add and remove some empty lines here and there
Tune readability of the code, nothing interesting
And a newline right after the 'for' loop as a delimiter
Merge branch 'develop'

Just a code maintenance.