ENH: Some cleanup