Code cleanup. Coder devel.
Merge branch 'develop'