Clearer variable names, fix typo in comment.