Painful Refactor