More Cleanup - Functions renamed with _