Refactor modern syntax