Continue refactor...