minor restructure