more structural cleanup