Fix/improve syntax.