some refactoring to android market