- Clean some code