Cleaned up globals