JAL-2523 start of refactoring...