More names, better doc strings.