bulk refactor
bulk refactor