small cleanup - changed visibility of internal classes