winterstorm_validate cleaned up