refine code as feedback

1 job for 140-validation-blocked-numbers in 3 minutes and 41 seconds (queued for 5 seconds)