Cleaning up some structure.