small cleanup of API