android little refactor