[master] Improve syntax