cleanup indentations
add trailing comma
Merge branch 'initial'