minor semantic changes
Some minor touches