Clean up java syntax stuff