CoralVM-Java: Refactoring