refactor syntax