misc whitespace cleanup, etc.