Codesniff cleanup for wsvalidate class