YDP Android mobile app ,code clean up