More cosmetics changes

Hanging new line indentation
Too long lines