Little changes
Improving code