minor cleanings and make it build with stricter compilers

some compilers seem to not like multichar integer constants