Style updates (with wbyoung).
A few todos in the comments.
Name changes (with wbyoung).