Reindent
Merge branch 'visual'