Improve naming & comments.