ENH: Small cleanup