some cleanup
changed java