clean; tweak indentation for blank lines; re-indent test