Comments updated
Code refining
merge out of no reason!