Doing some structural cleanup