Style changes. Many function changes.