cleaned up code and removed phone numbers. abstracted vars to change them 'if' needed

Signed-off-by: Akash Manohar J <akash@akash.im>