a bit of structural cleanup