Klientas refractored to better design.