JAL-1641 refactor