Re-arranged patterns for better cohesion