cleanup
improve validator
fix validator class