Cleaning up a bit
Java binding work