refactor using EC5 style
refactor using EC5 style