refactor: change to preferred syntax