code format/clean up

Nothing functional changed