Made comment more generic; anchored pattern match