More cleaning of design