Fix/clean