Updated comments.
Simplification.