Formatting improved
Merge branch 'local'

Concurrent improvents in the online github editor and the local branch "local"