Some refactor in android version