clean as one commit