Fix/cleaning