Refactor + google play jar