structural cleanup
structural changes