Do the previous commit in a more clean way