Tidy syntax/semantics more