Simplification and comments.