cleanup OTAPI_Exec

Cleanup OTAPI. Mostly indentation and adding early returns.