more clarification and cleanup