improve syntax