Simplify flow of previous commit