doc and whitespace cleanup