Cleaned up custom like validation