Refaktorerer client