minor whitespace and formatting fixes