minor restructures