Clean up some comments and code.