Revert "Revert "clean up & make public""

This reverts commit 5d89f9318047e2aac6328b07537495b9d16ccc3a.