first stab at cleaning up validators