Reformat, Refactoring android specific stuff, working with Client instances instead of static functions