Fix/cleanup