Clean up some code and comments.