Cleaning up code, added email and phone back