refactor for syntax