- Re-organize variables etc. to better match output