cleaned up java