Minor cleanup; whitespace, comments.