cleaned up globals