Better dissection of what should be public and private.