A lot of code cleaning