Reorders some code
Fixes spain number validation for non restrained control code cases