More little optimization
Some little modification