Syntax updates, just cleaning...