Client side Refactoring