Refactor...