Small refactor in bin/xl8