cleaned up global def declarations