improve def req handler spec for united states code