small cleanup
first java source test pass