Refactory

Refactory in some classes