Improved Code in MojioClient