structure changes for easier read