more restructuring/simplification