Better java
removed old name'd stuff