Cleaned Up PR

Cleaned up validToggler() and fixed PR problems