reformat a bit and clean up