Add macro to validate pvalues
Remove unnecessary return statement