Aesthetic and code organization changes.