Structural cleanup
3.1.2