Minor Structure Changes.