refactore galore continues