comment cleanup & clarification