Minor update to use variables more.