Adjust declaration order