Commented and cleaned the package validators