code format cleanup AGAIN