Code refactoring for sharix client