Minor cleaning...