Cleaned up version of our old validation class