Code cleanup - making public methods protected