Cleaned up the "native" calling a bit