update method names
refactor extract