[LF] [67116632] Refactor