small format changes to C and Java