ENH: somewhat better conventions