ENH: code improvements.