Moving potentially redundant code

moving non-required code into one secttion for clarity.
Will test this in case it does something.

Mainly testing initially that the ORDER of declaration was not affected