[fix] Cleanup rules to use regular expressions