restructure slightly