finish extract method

finish extract method
Merge branch 'dev'