Minor init change
Minor code change.
Simplified contact check logic.