minor changes (DRY and clarification)