I also made the indentation more consistent.
in preparation for #958 (closed)
This will create a new commit in order to revert the existing changes.
