Use more dedent and indenting

Successor of #150.