Perform minor cleanup and reformatting.