Clientside refactoring