Broad-range refactor and continuing updates