Added small semantic changes