Clean up.
Comments added.