doc and whitespace throughout