Clean up some comments and some descriptions.