Code Cleaning in AndroidApp