A few simple suggestions

Split into many commits like this to include explanation. And also to make it easer to review.