Cleaned up some duplicated validation methods