MNT: Refactor in progress