reformatting everything, breaking things out again