minor cleanup and clarification