Style and organization changes.