restructure removing grunt strangeness