Code cleaned!