bug 893: Fix indentation to make code-flow more obvious