cleaned up API helper modules