Privatize some components that should be private