Another code cleaning...