Code structure changes