Remove magic number. Update some comments.