Adding verify function and cleaning up class names