More cleaning and a working form