Some cleaning up and clarification