Some refactor
Some refactor