Small clarification and cleanup