Clarification and clean up