Clean a bit the code