Refactoring Android client
Code clean up
merge