Slight refactoring of the design section and variable reorder method