Made some code changes.