clean up some of the formatting
add XXXIDX markers so I know to come back and look at these fns