Fix build dependence on platform encoding.
Clean up whitespace in all java source files.
Remove plural in favour of singular version. Add a line between methods.