[Refactor] Pull down private class