Better comments and a more consistent name.