back to some clean code ... ;