More clarification/cleanup.