refactor(All): Refactor code