Clean organization + Update elements and attr and marker