Code tidy up
Upped Phone version