improve window phone code