Clean up out-of-date comments and some stray whitespace