Structural clean-up.
Started editign 11/11