Cleanup some comments and whitespace.