Cleanup of the `public' header