Tidy up naming and comment.