minor restructuring in api function list