- Some global variables rearrangements