some cleanup.
Some clarification.