Refactoring of BPT light paths