MNT: Code cleanup