Did some house cleaning with the structure