Clarify and clean up