fix
to suppress warnings re-order defining vars
remove trailing spaces
Merge branch 'develop'