got rid of private class