Removing comments and prints and renaming validation schema