Clean some Code