Additional clarification and cleanup