more breaking things out and cleaning things up