7.3-before
refactor
extract class