Some changes
Fixing code comments