validate/format phone numbers

fixes #291
minor cleanup