refactoring + wifi p2p