Refactor: modern syntax