* Refactor some classes