Cleanup, cosmetics, comments.