Just some semantic changes
Basic updates