More fixed stuffs
Remove private class. Ooops