Code structure changes.