More semantics and style changes