Clean up a bit the code.