nesting cleanup, todo slides for consideration