Still getting prettier with pattern matching