[ commitment ] - fix , clean