Some changes of the classes and methods improvement
'