More classes, some code clean