Remove unnecessary spans, fix indentation.
Fixes #335