some little restructuring