Added refactor comments.