More breaking things out and cleaning them up.