refactor modern syntax
refactor modern syntax