just before refactor
quick refactor