some structural cleanup