Made some small cleanup changes.