cleanup; fix indents