Made some cleanup changes.