Clean up, remove trailing spaces
Add missing docs for some configuration options
Merge branch 'feature/source-cleaning' into develop