Updated validator class

Removing references to functions that should now be variables also
removed more html code.