Minor cleanup and clarification