Clean up; add phone validator