Remove unused function. Add function headers.
Update function names and calls.
Create ContactSelector class