Code cleaning...