ENH: Minor code cleanup