Minor changes for the final submission.