clarify and cleanup