minor comments organization
minor comments organization