JAL-3477 A bit of refactoring for the better