did some minor restructuring