Systematically refactoring stage logic, aggregate information within header file, thus eliminating errors previously made all over the place in code.