Refactor mobile publisher