Cleaned some global variables up.