Clean up public functions