android: clean-up and some refactoring in java code.