This is just #cleanup to resolve a TODO Also add a package doc. Signed-off-by: Maisem Ali <[email protected]>