couple of structural suggestions