Add Java translation, and cleanup