Cleared a bit the code.