Make global variables standard