A mild refactor and some docs before I move on