MNT: Small refactor