Cleaning up strucutre a little