refactor: use syntax shortcuts