Refactoring on update of supporting WP8.1