Refactor the previous commit