Minor refactoring, eliminating some of the TODOs and indicating package
/ module public API (entry points)