Slight cleanup and comment clarification