adjustments to clean up the API