cleaned up the global variables' names