[899753] Part 1: Refactor