Standardized patterns, cleaned up