Re-factoring, considering wp7