Some Refactor