A bit cleaned code