- Minor variable reorganization to match order in documentation