More code cleaning...