Some refactor...